merge master
authorJoakim Verona <joakim@verona.se>
Sun, 25 Jan 2015 01:11:31 +0000 (02:11 +0100)
committerJoakim Verona <joakim@verona.se>
Sun, 25 Jan 2015 01:11:31 +0000 (02:11 +0100)

Trivial merge